Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 1 Jul 2011 20:35:00 +0000 (13:35 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 1 Jul 2011 20:35:00 +0000 (13:35 -0700)

Trivial merge